Update text matching function semantics and naming

It is now called `hasTextMatchesForAll()`, and returns
true only if there are matches for all patterns.

Author: csillag

src/app/components/HighlightedText/index.tsx

@@ -89,29 +89,29 @@ export const HighlightedText: FC<HighlightedTextProps> = ({
 
   const pieces: ReactNode[] = []
   let processedChars = 0
-  let processedTasks = 0
+  let processedMatches = 0
 
   while (processedChars < text.length) {
-    // Do we still have tasks?
-    if (processedTasks < sortedMatches.length) {
-      // Yes, there are more tasks
-      const task = sortedMatches[processedTasks]
-      if (task.startPos < processedChars) {
-        // This task with collude
-        processedTasks++ // just skip this task
+    // Do we still have matches to highlight?
+    if (processedMatches < sortedMatches.length) {
+      // Yes, there are more matches
+      const match = sortedMatches[processedMatches]
+      if (match.startPos < processedChars) {
+        // This match would collude with something already highlighted
+        processedMatches++ // just skip this match
       } else {
-        // We use this task
-        pieces.push(text.substring(processedChars, task.startPos))
-        const focus = text.substring(task.startPos, task.endPos)
+        // We want to highlight this match
+        pieces.push(text.substring(processedChars, match.startPos))
+        const focus = text.substring(match.startPos, match.endPos)
         pieces.push(
-          <Box key={processedTasks} component="mark" sx={sx}>
+          <Box key={processedMatches} component="mark" sx={sx}>
             {focus}
           </Box>,
         )
-        processedChars = task.endPos
+        processedChars = match.endPos
       }
     } else {
-      // No more tasks, just grab the remaining string
+      // No more matches, just grab the remaining string
       pieces.push(text.substring(processedChars))
       processedChars = text.length
     }

src/app/components/HighlightedText/text-matching.ts

@@ -61,13 +61,19 @@ export const findTextMatch = (
 }
 
 /**
- * Check if a pattern matches within a corpus, also considering normalization
+ * Check if all patterns match within a corpus, also considering normalization
  *
  * NOTE: depending on normalization options, the string length can change,
  * and in that case, match position can be incorrect.
+ *
+ * Also NOTE: if there are no patterns given, the result will be true.
+ *
  */
-export const hasTextMatch = (
+export const hasTextMatchesForAll = (
   rawCorpus: string | null | undefined,
-  search: (string | undefined)[],
+  patterns: (string | undefined)[],
   options: NormalizerOptions = {},
-): boolean => findTextMatch(rawCorpus, search, options) !== NO_MATCH
+): boolean =>
+  patterns
+    .filter(pattern => !!pattern)
+    .every(pattern => findTextMatch(rawCorpus, [pattern], options) !== NO_MATCH)

src/app/data/oasis-account-names.ts

@@ -16,7 +16,7 @@ import {
   AccountNameSearchResults,
   AccountNameSearchRuntimeMatch,
 } from './named-accounts'
-import { hasTextMatch } from '../components/HighlightedText/text-matching'
+import { hasTextMatchesForAll } from '../components/HighlightedText/text-matching'
 import * as externalLinks from '../utils/externalLinks'
 import { getOasisAddress } from '../utils/helpers'
 import { isUrlSafe } from '../utils/url'
@@ -121,20 +121,18 @@ export const useSearchForOasisAccountsByName = (
     console.log('Failed to load Oasis account metadata', metadataError)
   }
 
-  const textMatcher =
-    nameFragments.length && queryOptions.enabled
-      ? (account: AccountMetadata) =>
-          nameFragments.every(nameFragment => hasTextMatch(account.name, [nameFragment]))
-      : () => false
-
   const matches =
-    namedAccounts?.list.filter(textMatcher).map(
-      (account): AccountNameSearchMatch => ({
-        network,
-        layer,
-        address: account.address,
-      }),
-    ) ?? []
+    !isMetadataLoading && nameFragments.length && queryOptions.enabled && namedAccounts
+      ? namedAccounts.list
+          .filter(account => hasTextMatchesForAll(account.name, nameFragments))
+          .map(
+            (account): AccountNameSearchMatch => ({
+              network,
+              layer,
+              address: account.address,
+            }),
+          )
+      : []
 
   const consensusMatches = layer === Layer.consensus ? (matches as AccountNameSearchConsensusMatch[]) : []
   const runtimeMatches = layer === Layer.consensus ? [] : (matches as AccountNameSearchRuntimeMatch[])

src/app/data/pontusx-account-names.ts

@@ -9,7 +9,7 @@ import {
 } from './named-accounts'
 import { Layer, useGetRuntimeAccountsAddresses } from '../../oasis-nexus/api'
 import { Network } from '../../types/network'
-import { hasTextMatch } from '../components/HighlightedText/text-matching'
+import { hasTextMatchesForAll } from '../components/HighlightedText/text-matching'
 import { getOasisAddress } from '../utils/helpers'
 import * as externalLinks from '../utils/externalLinks'
 
@@ -83,22 +83,18 @@ export const useSearchForPontusXAccountsByName = (
     console.log('Failed to load Pontus-X account names', metadataError)
   }
 
-  const textMatcher =
-    nameFragments.length && queryOptions.enabled
-      ? (account: AccountMetadata) =>
-          nameFragments.every(nameFragment => hasTextMatch(account.name, [nameFragment]))
-      : () => false
-
   const matches =
-    isMetadataLoading || isMetadataLoading
+    isMetadataLoading || !nameFragments.length || !queryOptions.enabled
       ? undefined
-      : namedAccounts?.list.filter(textMatcher).map(
-          (account): AccountNameSearchRuntimeMatch => ({
-            network,
-            layer: Layer.pontusxtest,
-            address: account.address,
-          }),
-        )
+      : namedAccounts?.list
+          .filter(account => hasTextMatchesForAll(account.name, nameFragments))
+          .map(
+            (account): AccountNameSearchRuntimeMatch => ({
+              network,
+              layer: Layer.pontusxtest,
+              address: account.address,
+            }),
+          )
 
   const {
     isLoading: areAccountsLoading,

src/app/hooks/useSearchForValidatorsByName.ts

@@ -1,4 +1,4 @@
-import { hasTextMatch } from 'app/components/HighlightedText/text-matching'
+import { hasTextMatchesForAll } from 'app/components/HighlightedText/text-matching'
 import {
   Layer,
   useGetConsensusValidatorsAddressNameMap,
@@ -10,13 +10,13 @@ import { AccountNameSearchResults, AccountNameSearchConsensusMatch } from '../da
 
 function findAddressesWithMatch(
   addressMap: ValidatorAddressNameMap,
-  nameFragment: string[],
+  nameFragments: string[],
   network: Network,
 ) {
   const matchedAddresses: AccountNameSearchConsensusMatch[] = []
 
   for (const [address, name] of Object.entries(addressMap)) {
-    if (nameFragment.every(nameFragment => hasTextMatch(name, [nameFragment]))) {
+    if (hasTextMatchesForAll(name, nameFragments)) {
       matchedAddresses.push({ address, layer: Layer.consensus, network })
     }
   }

src/app/utils/vote.ts

@@ -1,5 +1,5 @@
 import { ExtendedVote, ProposalVoteValue, VoteFilter, VoteType } from '../../types/vote'
-import { hasTextMatch } from '../components/HighlightedText/text-matching'
+import { hasTextMatchesForAll } from '../components/HighlightedText/text-matching'
 
 export const getRandomVote = (): ProposalVoteValue =>
   [ProposalVoteValue.yes, ProposalVoteValue.no, ProposalVoteValue.abstain][Math.floor(Math.random() * 3)]
@@ -13,10 +13,7 @@ const voteFilters: Record<VoteType, VoteFilter> = {
 
 export const getFilterForVoteType = (voteType: VoteType): VoteFilter => voteFilters[voteType]
 
-export const getFilterForVoterNameFragment = (fragment: string[]) => {
-  if (!fragment.length) {
-    return () => true
-  }
-  return (vote: ExtendedVote) =>
-    fragment.every(fragment => hasTextMatch(vote.validator?.media?.name, [fragment]))
-}
+export const getFilterForVoterNameFragment = (fragments: string[]) =>
+  fragments.length
+    ? (vote: ExtendedVote) => hasTextMatchesForAll(vote.validator?.media?.name, fragments)
+    : () => true

src/oasis-nexus/api.ts

@@ -32,7 +32,7 @@ import { toChecksumAddress } from '@ethereumjs/util'
 import { fromBaseUnits } from '../app/utils/number-utils'
 import { getConsensusTransactionAmount, getConsensusTransactionToAddress } from '../app/utils/transaction'
 import { API_MAX_TOTAL_COUNT } from '../config'
-import { hasTextMatch } from '../app/components/HighlightedText/text-matching'
+import { hasTextMatchesForAll } from '../app/components/HighlightedText/text-matching'
 
 export * from './generated/api'
 export type { RuntimeEvmBalance as Token } from './generated/api'
@@ -1112,28 +1112,17 @@ export const useGetConsensusProposalsByName = (network: Network, nameFragments:
   const query = useGetConsensusProposals(network, {}, { query: { enabled: !!nameFragments.length } })
   const { isError, isLoading, isInitialLoading, data, status, error } = query
   const textMatcher = nameFragments.length
-    ? (proposal: generated.Proposal): boolean =>
-        nameFragments.every(nameFragment => {
-          if (hasTextMatch(proposal.title, [nameFragment])) {
-            return true
-          }
-
-          if (hasTextMatch(proposal.handler, [nameFragment])) {
-            return true
-          }
-
-          if (hasTextMatch(getCancelTitle(proposal.cancels), [nameFragment])) {
-            return true
-          }
-
-          return (
-            !!proposal.parameters_change &&
-            hasTextMatch(
-              getParameterChangeTitle(proposal.parameters_change_module, proposal.parameters_change),
-              [nameFragment],
-            )
-          )
-        })
+    ? ({
+        title,
+        handler,
+        cancels,
+        parameters_change,
+        parameters_change_module,
+      }: generated.Proposal): boolean =>
+        hasTextMatchesForAll(
+          `${title} ${handler} ${getCancelTitle(cancels)} ${getParameterChangeTitle(parameters_change_module, parameters_change)}`,
+          nameFragments,
+        )
     : () => false
   const results = data ? query.data.data.proposals.filter(textMatcher) : undefined
   return {