fix tag search (#1651)

src/components/@shared/atoms/Tags/index.tsx

@@ -15,9 +15,7 @@ const Tag = ({ tag, noLinks }: { tag: string; noLinks?: boolean }) => {
   return noLinks ? (
     <span className={styles.tag}>{tag}</span>
   ) : (
-    <Link
+    <Link href={`/search?tags=${urlEncodedTag}&sort=_score&sortOrder=desc`}>
-      href={`/search?tags=${urlEncodedTag}&sort=metadata.created&sortOrder=desc`}
-    >
       <a className={styles.tag} title={tag}>
         {tag}
       </a>

src/components/Search/utils.ts

@@ -35,7 +35,6 @@ export function getSearchQuery(
   text?: string,
   owner?: string,
   tags?: string,
-  categories?: string,
   page?: string,
   offset?: string,
   sort?: string,
@@ -45,83 +44,77 @@ export function getSearchQuery(
 ): SearchQuery {
   text = escapeESReservedChars(text)
   const emptySearchTerm = text === undefined || text === ''
+  const filters: FilterTerm[] = []
+  let searchTerm = text || ''
+  let nestedQuery
+  if (tags) {
+    filters.push(getFilterTerm('metadata.tags.keyword', tags))
+  } else {
+    searchTerm = searchTerm.trim()
+    const modifiedSearchTerm = searchTerm.split(' ').join(' OR ').trim()
+    const noSpaceSearchTerm = searchTerm.split(' ').join('').trim()
 
-  let searchTerm = owner
+    const prefixedSearchTerm =
-    ? `(nft.owner:${owner})`
+      emptySearchTerm && searchTerm
-    : tags
+        ? searchTerm
-    ? // eslint-disable-next-line no-useless-escape
+        : !emptySearchTerm && searchTerm
-      `(metadata.tags:\"${tags}\")`
+        ? '*' + searchTerm + '*'
-    : // : categories
+        : '**'
-      // ? // eslint-disable-next-line no-useless-escape
+    const searchFields = [
-      //   `(service.attributes.additionalInformation.categories:\"${categories}\")`
+      'id',
-      text || ''
+      'nft.owner',
+      'datatokens.address',
+      'datatokens.name',
+      'datatokens.symbol',
+      'metadata.name^10',
+      'metadata.author',
+      'metadata.description',
+      'metadata.tags'
+    ]
 
-  searchTerm = searchTerm.trim()
+    nestedQuery = {
-  const modifiedSearchTerm = searchTerm.split(' ').join(' OR ').trim()
+      must: [
-  const noSpaceSearchTerm = searchTerm.split(' ').join('').trim()
+        {
-
+          bool: {
-  const prefixedSearchTerm =
+            should: [
-    emptySearchTerm && searchTerm
+              {
-      ? searchTerm
+                query_string: {
-      : !emptySearchTerm && searchTerm
+                  query: `${modifiedSearchTerm}`,
-      ? '*' + searchTerm + '*'
+                  fields: searchFields,
-      : '**'
+                  minimum_should_match: '2<75%',
-  const searchFields = [
+                  phrase_slop: 2,
-    'id',
+                  boost: 5
-    'nft.owner',
+                }
-    'datatokens.address',
+              },
-    'datatokens.name',
+              {
-    'datatokens.symbol',
+                query_string: {
-    'metadata.name^10',
+                  query: `${noSpaceSearchTerm}*`,
-    'metadata.author',
+                  fields: searchFields,
-    'metadata.description',
+                  boost: 5,
-    'metadata.tags'
+                  lenient: true
-  ]
+                }
-
+              },
-  const nestedQuery = {
+              {
-    must: [
+                match_phrase: {
-      {
+                  content: {
-        bool: {
+                    query: `${searchTerm}`,
-          should: [
+                    boost: 10
-            {
+                  }
-              query_string: {
+                }
-                query: `${modifiedSearchTerm}`,
+              },
-                fields: searchFields,
+              {
-                minimum_should_match: '2<75%',
+                query_string: {
-                phrase_slop: 2,
+                  query: `${prefixedSearchTerm}`,
-                boost: 5
+                  fields: searchFields,
-              }
+                  default_operator: 'AND'
-            },
-            {
-              query_string: {
-                query: `${noSpaceSearchTerm}*`,
-                fields: searchFields,
-                boost: 5,
-                lenient: true
-              }
-            },
-            {
-              match_phrase: {
-                content: {
-                  query: `${searchTerm}`,
-                  boost: 10
                 }
               }
-            },
+            ]
-            {
+          }
-              query_string: {
-                query: `${prefixedSearchTerm}`,
-                fields: searchFields,
-                default_operator: 'AND'
-              }
-            }
-          ]
         }
-      }
+      ]
-    ]
+    }
   }
-
-  const filters: FilterTerm[] = []
   accessType !== undefined &&
     filters.push(getFilterTerm('services.type', accessType))
   serviceType !== undefined &&
@@ -162,7 +155,6 @@ export async function getResults(
     text,
     owner,
     tags,
-    categories,
     page,
     offset,
     sort,
@@ -176,7 +168,6 @@ export async function getResults(
     text,
     owner,
     tags,
-    categories,
     page,
     offset,
     sort,