oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

fix tag search (#1651)

Browse Source
This commit is contained in:
mihaisc 2022-08-12 02:38:13 -07:00 committed by GitHub
parent dc4add5c70
commit 27517faea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/@shared/atoms/Tags/index.tsx
View File

@ -15,9 +15,7 @@ const Tag = ({ tag, noLinks }: { tag: string; noLinks?: boolean }) => {
return noLinks ? ( return noLinks ? (
<span className={styles.tag}>{tag}</span> <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}> <a className={styles.tag} title={tag}>
{tag} {tag}
</a> </a>

25
src/components/Search/utils.ts
View File

@ -35,7 +35,6 @@ export function getSearchQuery(
text?: string, text?: string,
owner?: string, owner?: string,
tags?: string, tags?: string,
categories?: string,
page?: string, page?: string,
offset?: string, offset?: string,
sort?: string, sort?: string,
@ -45,17 +44,12 @@ export function getSearchQuery(
): SearchQuery { ): SearchQuery {
text = escapeESReservedChars(text) text = escapeESReservedChars(text)
const emptySearchTerm = text === undefined || text === '' const emptySearchTerm = text === undefined || text === ''
const filters: FilterTerm[] = []
let searchTerm = owner let searchTerm = text || ''
? `(nft.owner:${owner})` let nestedQuery
: tags if (tags) {
? // eslint-disable-next-line no-useless-escape filters.push(getFilterTerm('metadata.tags.keyword', tags))
`(metadata.tags:\"${tags}\")` } else {
: // : categories
// ? // eslint-disable-next-line no-useless-escape
// `(service.attributes.additionalInformation.categories:\"${categories}\")`
text || ''
searchTerm = searchTerm.trim() searchTerm = searchTerm.trim()
const modifiedSearchTerm = searchTerm.split(' ').join(' OR ').trim() const modifiedSearchTerm = searchTerm.split(' ').join(' OR ').trim()
const noSpaceSearchTerm = searchTerm.split(' ').join('').trim() const noSpaceSearchTerm = searchTerm.split(' ').join('').trim()
@ -78,7 +72,7 @@ export function getSearchQuery(
'metadata.tags' 'metadata.tags'
] ]
const nestedQuery = { nestedQuery = {
must: [ must: [
{ {
bool: { bool: {
@ -120,8 +114,7 @@ export function getSearchQuery(
} }
] ]
} }
}
const filters: FilterTerm[] = []
accessType !== undefined && accessType !== undefined &&
filters.push(getFilterTerm('services.type', accessType)) filters.push(getFilterTerm('services.type', accessType))
serviceType !== undefined && serviceType !== undefined &&
@ -162,7 +155,6 @@ export async function getResults(
text, text,
owner, owner,
tags, tags,
categories,
page, page,
offset, offset,
sort, sort,
@ -176,7 +168,6 @@ export async function getResults(
text, text,
owner, owner,
tags, tags,
categories,
page, page,
offset, offset,
sort, sort,