From cc53b93bcaaaa398550976a277f5178073a0dda3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 07:59:13 +0000 Subject: [PATCH 1/2] Bump webpack from 5.85.1 to 5.86.0 in /apps/block_scout_web/assets Bumps [webpack](https://github.com/webpack/webpack) from 5.85.1 to 5.86.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.85.1...v5.86.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 14 +++++++------- apps/block_scout_web/assets/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index d5c51d96accc..236899bcda80 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -92,7 +92,7 @@ "sass": "^1.62.1", "sass-loader": "^13.3.1", "style-loader": "^3.3.3", - "webpack": "^5.85.1", + "webpack": "^5.86.0", "webpack-cli": "^5.1.4" }, "engines": { @@ -16968,9 +16968,9 @@ } }, "node_modules/webpack": { - "version": "5.85.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.1.tgz", - "integrity": "sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==", + "version": "5.86.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz", + "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -30318,9 +30318,9 @@ "dev": true }, "webpack": { - "version": "5.85.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.1.tgz", - "integrity": "sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==", + "version": "5.86.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz", + "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json index b2283502367b..2a53be17b2d5 100644 --- a/apps/block_scout_web/assets/package.json +++ b/apps/block_scout_web/assets/package.json @@ -104,7 +104,7 @@ "sass": "^1.62.1", "sass-loader": "^13.3.1", "style-loader": "^3.3.3", - "webpack": "^5.85.1", + "webpack": "^5.86.0", "webpack-cli": "^5.1.4" }, "jest": { From 83ec9575fbd435212fd1fe85cb0ce16c9423f0b7 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Thu, 8 Jun 2023 15:58:36 +0300 Subject: [PATCH 2/2] Search label query --- CHANGELOG.md | 1 + apps/explorer/lib/explorer/chain.ex | 30 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79e6c3c19e06..d2706781162a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ ### Chore +- [#7666](https://github.com/blockscout/blockscout/pull/7666) - Search label query - [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches - [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend - [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index b43d383ce43d..281ea0390d9e 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -98,6 +98,7 @@ defmodule Explorer.Chain do alias Explorer.Market.MarketHistoryCache alias Explorer.{PagingOptions, Repo} alias Explorer.SmartContract.Helper + alias Explorer.Tags.{AddressTag, AddressToTag} alias Dataloader.Ecto, as: DataloaderEcto @@ -1500,6 +1501,31 @@ defmodule Explorer.Chain do end end + def search_label_query(term) do + inner_query = + from(tag in AddressTag, + where: fragment("to_tsvector('english', display_name ) @@ to_tsquery(?)", ^term), + select: tag + ) + + from(att in AddressToTag, + inner_join: at in subquery(inner_query), + on: att.tag_id == at.id, + select: %{ + address_hash: att.address_hash, + tx_hash: fragment("CAST(NULL AS bytea)"), + block_hash: fragment("CAST(NULL AS bytea)"), + type: "label", + name: at.display_name, + symbol: ^nil, + holder_count: ^nil, + inserted_at: att.inserted_at, + block_number: 0, + icon_url: nil + } + ) + end + defp search_token_query(term) do from(token in Token, where: fragment("to_tsvector(symbol || ' ' || name ) @@ to_tsquery(?)", ^term), @@ -1646,6 +1672,7 @@ defmodule Explorer.Chain do {:some, term} -> tokens_query = search_token_query(term) contracts_query = search_contract_query(term) + labels_query = search_label_query(term) tx_query = search_tx_query(string) address_query = search_address_query(string) block_query = search_block_query(string) @@ -1653,7 +1680,8 @@ defmodule Explorer.Chain do basic_query = from( tokens in subquery(tokens_query), - union: ^contracts_query + union: ^contracts_query, + union: ^labels_query ) query =